添加直接获取配置的方法，解决多商户管理场景下的 ThreadLocal 限制#3863
Merged
binarywang merged 3 commits intodevelopfrom Mar 3, 2026
Merged
Conversation
Co-authored-by: binarywang <1343140+binarywang@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Refactor WxPayConfigHolder for improved lifecycle management
添加直接获取配置的方法，解决多商户管理场景下的 ThreadLocal 限制
Jan 19, 2026
🤖 Augment PR SummarySummary: 本 PR 为微信支付多商户场景补充“直接按参数取配置”的能力，绕开基于 ThreadLocal 的上下文限制。 Changes:
Why: 解决异步/线程池下 ThreadLocal 丢失导致无法可靠获取多商户配置的问题，并在保持原有切换接口可用的前提下提供更直接的访问方式。 🤖 Was this summary useful? React with 👍 or 👎 |
![augmentcode[bot]](https://avatars.githubusercontent.com/in/1027498?s=60&v=4){kind=small}
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java
Show resolved
Hide resolved
...in-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Pull request overview
本 PR 为 WxPayService 添加了两个直接获取配置的新方法，解决了多商户管理场景下 ThreadLocal 的限制问题。新增方法不依赖线程上下文，适合在异步、线程池等环境中使用。
Changes:
- 在
WxPayService接口中新增getConfig(String mchId, String appId)和getConfig(String mchId)两个重载方法 - 在
BaseWxPayServiceImpl中实现这两个方法，直接从ConcurrentHashMap读取配置 - 添加 8 个测试用例全面覆盖新功能的各种场景（正常、边界、异常情况）
- 更新
MULTI_APPID_USAGE.md文档，补充使用场景和最佳实践说明
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java |
在接口中添加两个新的 getConfig 重载方法，包含完整的 Javadoc 文档 |
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java |
实现新增的两个 getConfig 方法，包含参数验证、精确匹配和前缀匹配逻辑 |
weixin-java-pay/src/test/java/com/github/binarywang/wxpay/service/impl/MultiAppIdSwitchoverTest.java |
新增 8 个测试方法，覆盖新功能的各种使用场景和边界条件 |
weixin-java-pay/MULTI_APPID_USAGE.md |
更新文档，新增使用方式说明、场景示例和方法对比表 |
...in-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java
Show resolved
Hide resolved
...in-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java
Outdated
Show resolved
Hide resolved
Owner
|
@copilot apply changes based on the comments in this thread |
Co-authored-by: binarywang <1343140+binarywang@users.noreply.github.com>
Contributor
Author
已根据 Code Review 反馈完成以下改进（提交 59b728f）：
|
Owner
|
@copilot apply changes based on the comments in this thread |
Contributor
Author
所有的代码审查反馈已在提交 59b728f 中完成应用： ✅ 已完成的改进：
所有三个审查线程均已标记为已解决。如果需要其他修改，请告知具体需求。 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
改进 WxPayService 配置获取机制
问题分析
实现方案
测试
文档
验证
根据 Code Review 反馈的优化
主要改进
Original prompt
💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.